Merge "Revert "Blacklist failing test.""
am: b25a31a182

Change-Id: Ic29b859c2850293a3e7a87726fb5f1f3f971b4b8