am 32be57d1: am 622b190c: am b81df8e3: Merge change I5535bbdf into eclair

Merge commit '32be57d1000df0356f19eab01bbf828510d488f6'

* commit '32be57d1000df0356f19eab01bbf828510d488f6':
  Disable flaky and failing tests.