Merge "Fix a memory leak" am: 1c128fa54e
am: e32d1389ca

Change-Id: Iafbaf7960415e4e1f89bf56fa4eac07c29f80a0c