cot: no more copying pasta
Merge branch 'cm-11.0-dev' into nextbit