Merge "Throw IAE when crypto or descrambler is not given for secure codec"...
Merge "Throw IAE when crypto or descrambler is not given for secure codec" into oc-dev am: e09e9661 am: 615fd21a
am: d21f8c13
Change-Id: I6dd2223b0efbb53be691d25cdf9971b54311048b