Merge "Fix a memory leak." am: 1715678a89 am: 8f9c005fa9 am: 85785b557a
am: 9dfed40bd8

Change-Id: I35b03837734c4bab706faf99e8f9d3596e7ead92