Merge "NPE fix for JobScheduler" into nyc-dev