am b387a7f2: Merge "Wait for device to disappear after reboot-bootloader."

* commit 'b387a7f2168a720fa486f31e8f3189114f69c0db':
  Wait for device to disappear after reboot-bootloader.