Merge "Fix a memory leak" am: 1c128fa54e am: e32d1389ca
am: 654e5d3a9b

Change-Id: I3511f7423cf848c7aa95a5e9fe49620b8a982f82