Merge "Revert "Throw IAE when crypto or descrambler is not given for secure codec"" into oc-dev