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

Change-Id: Ieca1856eab5865c94e90acd26544f48d16e1ff3c