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

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