Merge "Fix a double-free"
am: 98d51d994f

Change-Id: I44634d2e101bf0f6a2284e55138412ffa5c1862f