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

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