Cleanup.

Revert import changes that are both unneeded and violate coding style,
fixup coding style for some of our additions and simplify code.

Change-Id: I25f00e3ab16bde939cf82b0d3a0bfb77b90ac836
Merge remote-tracking branch 'cm/cm-11.0' into HEAD