Merge "Fix more race conditions in WeakHashMapTest." am: e565c2cc5d
am: 45face7aee

* commit '45face7aeec7c100497d3706c4ef1fa6e2020878':
  Fix more race conditions in WeakHashMapTest.