Cleanup comments and whitespace

Change-Id: I7597c590a59ada855d759615fbb1675c3bcfe461
Merge "Cleanup comments and whitespace"