Merge "Disable File.getCanonicalPath caches." into oc-dev