Fix memory leak am: 2815be21f2 am: 95677dbdd2 am: 5ddcff473d am: 0336b0c250 am: a8215db0da am: 219c995c4a am: ac53fdd598
am: eec49892fb

Change-Id: Ia73f7034578b5c9fb0cfdde4b582d284c9ab7a4c