Comment and whitespace cleanup

Change-Id: I7ac44f4d371faa3c6941ccf8a4654a035e9b05a5
Merge "Comment and whitespace cleanup"