Merge change 25078 into eclair

* changes:
  Fix FileObserverTest#testRun.