Merge "Fix race condition in WeakHashMapTest." into jb-dev