am 578d21fd: am e319841d: am 05e4e78d: am 1b391d64: am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev

* commit '578d21fddc2e15441d3404e6ee5c5813d95165d6':
  Fix issue #22802782: APR: NPE in package manager with bad intent data