Merge "RestrictedLockUtils was split into ...Internal"