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

Change-Id: I66bb970f5c537e0a7e3ae482f80e2f6e39572149