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

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