* whitespace and comment cleanups only Change-Id: I4e631e9a9b8151758dc8c96b3aef76b963d5ea7e
Change-Id: I5c156879f3c85f1555a1411695ac43cefbbf3b99