am cfec7e72: Merge "Fix a race condition that makes tests unstable"

* commit 'cfec7e72fd650067c1589c0d26f3f089a45c3067':
  Fix a race condition that makes tests unstable