Reformat comments

Change-Id: I21588bd64ce534a72c8e6ed7f21045d1ced3ba25
Merge "Reformat comments"