Merge changes from topic "move sched_policy functions"
am: e5c06e4050

Change-Id: I92310f7dd60384b95c056c98cdc616857ebcd1ec