[automerger skipped] [automerger] Fixes a double free in ContentEncoding am: d2ff9ba6d9 am: 126c36767c am: 14de93dcba am: 262d9ebb99 am: 675d296525 am: 6cdf87a296 am: 8c18b78a7e am: 6e420b88c6 am: 95a2529f2a -s ours
am: 6dec5c5e3d -s ours
am skip reason: change_id Id7de1f8c35ef2f6458c6fb6c7751a84fe43ed1cc with SHA1 f2aadecf97 is in history

Change-Id: I2d788e357835f701bd594811fdb3eaf13186f1ba