Merge "fastboot: Wait for reboot-fastboot to complete before signaling success." am: b81bc9ec00 am: b17ce9767d
am: a273d253f2

Change-Id: I57a70a29ce5fbd86328ce2fac96a780bf807a759