Clean-up pep8 H402-H403 warnings

Change-Id: Iee350c91852d350cfd7004802d9ec727e3766698