Merge "Make LocalFile file locking calls use Status::wrap"