Merge "Remove references to sched_policy.h in RS"