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

Change-Id: Iaca7cc3cb3d25cfed0198e05da78f81e08043276