Merge "Expand whitelist" am: 006065fee4 am: bff26f4bf1 am: 21b2ab9e11
am: 6f594b810f

Change-Id: I72c19c42d8fbaaeffc7541859369822a585c4b3d