Merge "Fix a memory leak" am: 3260678523
am: 7e316c05c6

Change-Id: Ic85922afaa66b946aa609d9d32ddc9ef72d64cda