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

Change-Id: I2fa1a52900ab9ed5ae86e44300aa7747dc912207