Merge "Replace reboot-fastboot by reboot fastboot"