Merge "Avoid waiting for threads to create"
am: 15303ace5d

Change-Id: Ieeb6f2e67b03970d40c0006ca1e97a1e9a180747