Merge "Fix a 'memory leak'"
am: 38e7338d92

Change-Id: Ie6670cd3f6fe1405859d75d2454ec6894f5c5913