Merge "Fix potential invalid memory access for concealment in decodeEnvelope()" am: 6acfe3b799
am: 3d9793633e

Change-Id: Iba356069f8d51e6a2afd199f62b84867dd34902e