Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev