Misc fixes as passed to us

forked from XDA Garwynn
Merge branch 'origin/cm-11.0'