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

Change-Id: I95c718361fcb64fb67c84441abd0309aeb1d6a78