Merge "Clearkey plugin didn't handle negative test cases" into oc-dev am: 565a0ed7f8
am: 509850e7eb

Change-Id: Ib0f5e773f661e0b2794add844ea96fe2b8c96212