Merge "Fix a memory leak"
am: cb1b68f9b3

Change-Id: Ia7a5fbc737d702615499bccd6492aac9ce3d0ce3