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

Change-Id: Id80937d84f4e1b28673b1e6b6ee6c4741b01efb0