Code cleanup.

Enforce 100 char line length, and remove checks for always-true
conditions.

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