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

Change-Id: I0be976691eeb0275510e14f6c3bb1f9627857166