Merge "Fix a memory leak"
am: a7dbdc8553

Change-Id: Icfff65b3db3863569cda75bed53f01defbadb799