Merge "sched: remove "hmp" references in the code"