Fix NPE in JobPackageTracker am: 86b300c374
am: 60c30cf416

Change-Id: I2980a489f6fe8925163df97dc9c542f39f4b0577