pep8 fixes

Fix for Ic7afd8a11b23d55e5bc9089b041e16bef3ad3d0e

Change-Id: I07f7555953737b7f5a7c76356b7c3988bbea0780