Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge branch 'sgt7/cm-11.0'