Update formatting

Change-Id: I8fdd9ba8826fa206a4c7146b743b8896a56845b8
Merge "Update formatting"