Update formatting

Change-Id: I7586c4d50f7332c515b8377749c4250cc9e04d83
Merge "Update formatting"