am d45c7633: am 1a053eaf: am dcd96ead: Merge "Maybe fix issue #22283836 -- package manager NPE." into mnc-dev

* commit 'd45c7633c5889650d419c0e1d8ba19b00e25a8c2':
  Maybe fix issue #22283836 -- package manager NPE.