Merge "LockManger documentation cleanups."