Merge "Fix L3 HLS decryption" into nyc-mr1-dev