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

* commit '3b34cc634ad00ecf5bef4913dda427e7c09661d6':
  Change intern table to not use WaitHoldingLocks