Merge "Change intern table to not use WaitHoldingLocks"