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

Change-Id: I7769bf73bd19e17818a7b36cad6f33a6a417e6b2