Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e * commit '8806a8e8f1c5faf26329a42822b9d61c014aa1e9': Fix race condition in WeakHashMapTest.