Merge "Merge remote-tracking branch 'dev/msm-4.9-sched' into msm-4.9"