Merge "Expand whitelist"
am: 006065fee4

Change-Id: I8e370c7afddc4911e3860d62809fd007bac40a0b