Update indentation and spacing

Change-Id: Ie000e71857cd8e5d5c0df326c7c30ebebc795b7d
Merge "Update indentation and spacing"