PEP8 E121 has been resolved

Change-Id: I6ad2704100447c5a3be12c2ebeec824726e3bd0b
Partial-Bug: #1085346
Merge "PEP8 E121 has been resolved"