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