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

* commit 'e565c2cc5d72d1d83890d5f410441a2713ffe958':
  Fix more race conditions in WeakHashMapTest.