CM12vification

Change-Id: I648f47fa681c1720aac62e83844d2c901c31b58f