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

Change-Id: Iaf4807095923ceba155128852c18b47323f8ce0e