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

Change-Id: I248e96898c155c019e0af826b92520f373e3773e