Merge "Revert "Blacklist test failing on host.""
am: 18d70c19fd

Change-Id: I9f57feecf0c84a2e76c6b2300cba54f3add52230