Merge "Remove isVolatile/markVolatile logic from LocalFile"