Merge "Merge dev/msm-4.9-sched into msm-4.9" into msm-4.9