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

Change-Id: Ic67c8b2fdcf6a942cf0a0bbe952883fb3b389d04