Update formatting and whitespace

Change-Id: Ibcc891956ba6eb10f31daf5a67a839e091d62adf
Merge "Update formatting and whitespace"