Merge "Fix a memory leak" am: cb1b68f9b3 am: 894337ee0b
am: 2a7d34014a

Change-Id: I2b763775555659f77e969f1d4d5bc73363afc53b