Fix memory leak am: 2815be21f2
am: 95677dbdd2

Change-Id: I2c594af2d424ae9247d4fdeeffea8a3562616928