cot: again with the stupid shit
Merge branch 'cm-11.0-dev' into nextbit