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

Change-Id: I32b6726dc8b03bf04a161ea3b8ced5aa29dfb923