[TEMP] fixes for cm-12.0

lots of shit that will get reverted later

Change-Id: I6748767e4f1641e4754151eb025c67ae635a45bd