am 11237947: Merge "Change intern table to not use WaitHoldingLocks"

* commit '11237947eefd3ec3167d9df41f2f3a041e717b6f':
  Change intern table to not use WaitHoldingLocks