Merge "Fix fastboot to not add '-' before suffix"