fix pep8 errors: E231, E128

pep8 code check fail with some complain.
Closes-Bug: #1226678

Change-Id: I4a50363c5e7f9f9e6eabbb4913a8a2127fb5da6c
Merge "fix pep8 errors: E231, E128"