Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev
am: 2f898c4df5

Change-Id: I3c987d0d74f9f60fe23ab7d1cc815b4343503194