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

Change-Id: I076520b4a8a40ade304d22f0b0a408de3734ac9a