Merge "Fix a memory leak"
am: 1c128fa54e

Change-Id: Ia88cd9771cd5c68cf91f62b975537fd3a5f37dba