Update formatting

Change-Id: I5cd038afb609eb71e86b7e23839083cea2531e1a
Merge "Update formatting"