cm: Underp package names

 * Go back to sleep, Steve.

Change-Id: Ie8aa55981ec2447741119cb413798568174ce659
Merge commit 'f1deb14ac0f163aa5a9f3e4f2561f238bbafc125' into cm-11.0