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

Change-Id: Iead86f735071b1107afc2a018110af8f2a604c5b