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

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