Fix pep errors of recently merged patches

Change-Id: I54e3dd4116ccd5898d6098a5bb6ed0fc4cae82cd