bye bye cm, hello candykat

Change-Id: Iea3fe00878b78de7be5545b7892ec582226fa389