Merge "Expand whitelist" am: fe88a5e81d am: f907b0fcc7 am: edc3f365a0
am: 6320e20955

Change-Id: Icc2326064d010596918081487f69a37d0b0988dd