Merge "clean up comments" into pi-dev
am: b8dcc91eb9

Change-Id: I9a29d924b1f00491d963e6bf93172b1b622a73a9