Try to avoid apparent race condition in test_async

Change-Id: Ia5b02f25d3e712ecd1f665c731d1fb616acc01e7
Merge "Try to avoid apparent race condition in test_async" into develop