Fix merge derps the easy way

merge from cm-11.0 ;)