Merge "Fix a memory leak" am: a7dbdc8553
am: d8ce8e33e9

Change-Id: Iec7c6507badef8b5b53b50e242eed34f5dbfbb8a