Merge "Add tests to validate key length for clearkey plugin. am: c312e21b5e  -s ours am: 4a9b599f9a  -s ours" into oc-mr1-dev