am bc18fe85: am fd1c028e: Merge "Handle hotplug events as described instead of rescanning"

# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bc18fe851c98dbe6be4eb2655efb1ef95902d961':
  Handle hotplug events as described instead of rescanning