Fix coding style.

Change-Id: I520b16f1c9a927a93d9e1bd4f7e712769d341e58
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2