Update formatting

Change-Id: Ieee4747cf2401d0d89a497a7637d32348192f481
Merge "Update formatting"