Fix PEP8 E126 and E202 errors

Do both as they are all in the same set of files that required
major re-formatting.

Change-Id: I6e8a8ce19a55105124a33c0e2487fc4b4e06d252
Merge "Fix PEP8 E126 and E202 errors"