Merge \"Fix NPE in JobPackageTracker\" into nyc-mr1-dev
am: 12fae936db

Change-Id: If4dde3752f6ddb268dc5ca2b9ce81e5e82fccb89