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

* commit '3e2d20636f9eaee1226074b99017d759c6f3b7a0':
  Remove test given its flakiness.