Use 4 spaces to indent, per Python coding standards

Change-Id: I472d922f51b944cb3ce8519f612b485c0191cb77
Merge "Use 4 spaces to indent, per Python coding standards"