Fix hacking rules H101 and E265

This is trivial, but easy to get out of the way.

Change-Id: Id261784e71c1b763c60090ffed92430d359f448b
Merge "Fix hacking rules H101 and E265"