CM12vification

Change-Id: I048c15e2a0e0c417f61f4001a0b7ccc6d64df0f1