Merge "Fix CtsMediaHostTestCases" into oc-mr1-dev