Merge "Fix a double-free" am: 98d51d994f
am: 9a533b4b5b

Change-Id: I204235abae1d1f23bc87fd1bf803143e16c300bb