Clean some comments

Change-Id: Id688489e27dcfc5d85aec3d42745ec06f8ce020c
Merge "Clean some comments"