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

Change-Id: Icb04381a4c421ceb543616db1c8f3d965d0484b1