Merge "Clearkey plugin didn't handle negative test cases" into oc-dev