Merge "Remove test given its flakiness." am: 3e2d20636f
am: f6eb61f310

* commit 'f6eb61f3100882f8c8ab2fc93eee7df45c65a679':
  Remove test given its flakiness.