Merge "Fix a memory leak"
am: 9d05a1150c

Change-Id: I4d0952985212bf6c1ccc9cb3eddca2b22e301cfa