Update formatting

Change-Id: I3cbe1f5e48730fbbe57e4b20a0c202edddc93c95
Merge "Update formatting"