Merge change 25356 into eclair

* changes:
  Filter out failing cases for future investigation.