HeadsUp: Clean up.

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