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

Change-Id: I9bdebc89d454ed1b75e1882e38bf90425980103c