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