Merge changes from topic "revert move sched_policy functions"
am: 7e15ad7ecb

Change-Id: Id58a376e5e0216cf01ce201ed3061d5b8d7e8d5b