Fix code formatting issues.

Change-Id: I5c3cde249cd5b514c616b8c42b8eb2549de247a6
Merge "Fix code formatting issues." into cm-10.1
Merge remote branch 'cm/cm-10.1' into cm-10.1