Merge "Properly finish daemon init when initial USB scan complete"
am: 2aabeed1fd

Change-Id: I0f687584e247d339952794713c0a5a7d7c62127a