Merge "Fix fastboot to not add \'-\' before suffix" am: ce24abe261
am: ec7fa7b479

* commit 'ec7fa7b479453c6fd55cf794c16202f1c78a91d9':
  Fix fastboot to not add '-' before suffix