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

Change-Id: I33dc8db8cf347b43a404cb0d33b7f6a0a005da6a