Merge "Remove duplicated comment section" into rvc-dev am: ae7e3c0765 am: c23a007c3c am: a02e3ee832 am: f758e9dbc7 am: 6173993ff8

Change-Id: Ic0dca124249bf36754b780da417df4392b91a1b2