a206e11fad
This avoids leaking the thread during acceptance tests. Change-Id: I18a7f57bc6b381f28006a20b6cffda0be6b3fb46