Fix pep8 failures on rule E265

Change-Id: I5aae8afb822c1a840572c75120f16432f317cedd