Wait sooner for non-daemon threads am: dc77ca3d54

Change-Id: Ie726b5803e140d368d36290204700946da730ec3