Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8  -s ours automerge: 8806a8e
automerge: 81598a5

* commit '81598a534fe066384bb27a6add0c631a6c16b177':
  Fix race condition in WeakHashMapTest.