Merge "Fix job scheduler crash due to uninstall race" into nyc-mr1-dev am: 24ab3aafe2
am: 35bf3b9ab8

Change-Id: Iabef09949945ac6a28e30566765a43d1e1ca4922