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

Change-Id: I904a88d2cd9568c4ce19702614af6ae6d45b6d07