Merge "Remove duplicated comment section" into rvc-dev am: ae7e3c0765 am: c23a007c3c am: e05185ba78 am: 7cfc3ec726

Change-Id: If0163d21d1a0253f10f2f2a003bd539208544ece