Merge "Disable flaky test."
am: c24b8df48b

* commit 'c24b8df48be848af1f4cb54e9caef2b7d6afe680':
  Disable flaky test.