Merge "Blind fix for InterruptedException in runBlocking." into tm-qpr-dev