Merge "Removed unused LockManager var"