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

Change-Id: I10d93e317386856ca6dda4fd920bf71e3eabcb02