Merge "Expand whitelist" am: fe88a5e81d
am: f907b0fcc7

Change-Id: Ifb2506e0f8cf697d1bbd4eb0ea744ed8fc9d2b63