Merge "Revert "Fix coding style."" into cm-10.2