Fix remnant of 'sched: Remove stale power aware scheduling remnants and dysfunctional…'
Fix merge errors