Merge branch 'cm-11.0_sched_mc' into cm-11.0
Merge branch 'cm-11.0_sweep2wake' into cm-11.0