Fix comments which aren't accurately fixed by clang-format
am: 36db871ce4

Change-Id: Ie99dd3c3f829e669b5575a003faebf6ebf186cca