Merge "Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c am: 0e443c1320" into nyc-mr1-dev-plus-aosp