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

Change-Id: Id277fc4fd3572b5ae3a4c35296202697f0bb5d7c