Merge "Address various JobScheduler API feedback." into oc-dev