Adjust a bunch of hacking violations.

- Fix new hacking violations!
- Add more comments!

Change-Id: Ida0c1b6c98a8f45a15985b33529a1f479e595db5
Merge "Adjust a bunch of hacking violations."