Merge change 25298 into eclair

* changes:
  Clean up temporary files after generating coverage report