am d27d769b: Merge "Don\'t set the upload type unless in debug" into ics-mr1

* commit 'd27d769bc23b88d97bbdf6a40384977afbd7a69d':
  Don't set the upload type unless in debug