Merge "Amend package whitelist." into pi-dev am: fc4ae7ec0e
am: 8ff801eee4

Change-Id: I19f5d11ca96f313cbd8ed9b64071ac663ebde220