Merge "Support 'adb reboot fastboot' command conditionally." am: 6544056d54
am: df5b2ac994

Change-Id: I319592a99ade8d91b1c47e6cc48b1641952907f0