Merge "Make package whitelist the last check in activity starter." into qt-dev
am: 52981d54de

Change-Id: Ic54fc8a4851cb69aa9cfb17bc1c362c9303bbd9e