cm: Underp package names

 * Go back to sleep, Steve.

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