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

Change-Id: I537ed237d617158815fded9cb8e67941b22b24d5