[TEMP] fixes for cm-12.0

lots of shit that will get reverted later

Change-Id: I355130f7ec33e51bd7060d105b46d45720dcf742