Merge "Revert "Blacklist flaky test.""
am: 6e9854e4df

Change-Id: I42572b4eb6f2fc4b33121896ae63b45b42d428db