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

# Via Gerrit Code Review
* commit 'fd1c028e34fc559ccccebd18979ee85ec7821dea':
  Handle hotplug events as described instead of rescanning