am b020b0d9: am cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev

* commit 'b020b0d97d80f0ebb550ce58a5b36787cfcf6df8':
  Avoid NPE when no staged installs.