Merge "[LockManager] Added support for a default lock manager."