Merge "Revert "Blacklist test that times out.""
am: 5e8ea904aa

Change-Id: Ia58f8cd34ebc41db20024c1c7f946d734a6df715