Merge "Make doTestLockCalls() faster"