Fix L3 HLS decryption am: 2cc3afc8a5
am: b135fb9849

Change-Id: I635c87f2d11306152bb69a3504cad4718f61e693