Merge "Yell if NDC callers are holding bad locks."