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

* commit '62538d84c26624c2e3336489f5c33a62e850dd66':
  Fix race condition in WeakHashMapTest.