Merge "Remove duplicated comment section" into rvc-dev am: ae7e3c0765 am: 904431c8cf am: 9181db399c

Change-Id: I433ee43aa528093a2a5484abfc5d525bc62c3d06