Merge "Fix a memory leak" am: a7dbdc8553 am: d8ce8e33e9
am: 584d6870c1

Change-Id: I800935bc4dcec34d4f16d946f426371859585f6b