Merge "Use content type specified on the command line" into oc-dev
am: f89bf30312

Change-Id: I2eafecfbf73333541a8b28726dc2af0a456443c0