Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge remote-tracking branch 'hydra/cm-11.0-4.3-sensors' into cm-11.0