Merge "Maybe fix issue #22283836 -- package manager NPE." into mnc-dev