Merge "Remove duplicated comment section" into rvc-dev am: ae7e3c0765 am: 904431c8cf am: 9181db399c am: acbbb4a9d3

Change-Id: I76f60dca2686f2ffc6591becd5a5ab1f36ee9457