Cleanup inconsistent code style

Change-Id: Ie3c660e7de32c11d2ee368783f0c66387a8f9157
Merge "Cleanup inconsistent code style"