fix same race condition in other test
Merge branch 'master' into new-guava