Merge "Blacklist test."
am: cf8e60fcee

Change-Id: I991d6ea11aa8405ebaab4178dd6653f93ff6d3ba