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

Change-Id: I85604faaebe96d0ff4a5c0f39659c9aa697a96b7