Merge "Fix a memory leak" am: 8126819588
am: 834d6740eb

Change-Id: I57b2cc286ced486930ab523e8bb44e8266d6200c