Merge "Fix MediaDrm cts tests" into klp-dev