Merge "Fix L3 HLS decryption" into nyc-mr1-dev am: bd264ab1c8 am: 521db1d1e7
am: d5a5c18b17

Change-Id: Ic76fa57cf36281f9c3be9570e67f6e2da0d7bff2