Fix PEP8 H405 errors

Change-Id: Id9ea03e7d88148f84bffe1b18b5b4315e6123012
Fix PEP8 E265 errors

Change-Id: Ieb9a9af1da27d3935d1a4d3cfb61b0ccb03d099a
Merge "Fix PEP8 H405 errors"
Merge "Fix PEP8 E265 errors"