This is the first step towards the goal of moving the scheduler into a separate library. Change-Id: Ifa6137c239c215a3d323213ee74d34b419622be4 Related: OS#5599, OS#3761