Merge "Replace FOR UPDATE with LockManager use in LocalFile::lock()"