Update formatting

Change-Id: Iaee2ab4f36d3a0dce143c62965ab29de504b31ea
Merge "Update formatting"