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