[TEMP] fixes for cm-12.0

lots of shit that will get reverted later

Change-Id: Ice32e67a4b3c07e69306ab24b7f95ba9d90de316