Scheduler fixes

Change-Id: I2d329026fd4857d7196db7aa2f8525768705c9ec
Merge "Scheduler fixes" into android-4.4