Merge "[LockManager] Memc lockmanager improvements."