Merge change I97af6ec8

* changes:
  More java.io.File cleanup.