PEP8 fixes

Cherry-pick elements from Ia32b5d7c57b5a5967651ef44b6582ccf3070774b
(review 3147).

Change-Id: Ie73c39099dfca9b9e590c541ae8134db1944ed51