Fixed trunk pep8 errors

Change-Id: I9f5136402d03fe832c2eae6e09d841276784d2bf
Closes-Bug: #1388980
Merge "Fixed trunk pep8 errors"