Update code formatting

Change-Id: Ib272c3255bc1c673b351a1c00ba5aae17c891a70
Merge "Update code formatting"