Merge "Replace reboot-fastboot by reboot fastboot"
am: cd68bda4ec

Change-Id: I311a3b93b27a8360aa81447d482e6c0c2e2cc404