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

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