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

Change-Id: Iedbb93680183c8539c131690b345bc54263fdcd3