Fix memory leak am: 2815be21f2 am: 95677dbdd2 am: 5ddcff473d am: 0336b0c250 am: a8215db0da am: 219c995c4a am: ac53fdd598 am: eec49892fb am: d35cf52767 am: c2e1d3fb67 am: bcd788729b
am: 8b7e11a769

Change-Id: Id60f67ae23a537f985fa146185b48ad2fe566b99