Merge "Fixes for JobScheduler sourcePackage fields"