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

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