Merge remote-tracking branch 'cm/cm-11.0' into aosb