Update code formatting

Change-Id: I6a004a2d1ee803325cb6cfa3ee797a89db058635