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

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