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

Change-Id: Iba075d9f25750f4bf461d95a3a3b5c473a886c6f