[TEMP] fixes for cm-12.0

lots of shit that will get reverted later

Change-Id: I3848a546ae3696a00225138629fbe3d23906013c