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

Change-Id: I38e8b5aee1f1d8e231089074d31cef0b5ce58c1b