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