Merge "Fix a memory leak"
am: 880d4e8574

Change-Id: I411fd53aa80fc790773b8878bdeff06a4be40b51