Update formatting

Change-Id: I5ec6257295261caab6cb2d9eb9d32ce76cae08a2
Merge "Update formatting"