Update formatting

Change-Id: I9aa56cbe0989d6f302ee0f47c4a6154101f73e90
Merge "Update formatting"