Merge "Fix a memory leak"
am: 8126819588

Change-Id: Ie33953edea0c4bee98fccff3bb8b80d8c0357a19