Merge "Fix potential memory leak." am: 89bdf3ae71 am: 5c86ca4a50
am: e74e76d597

Change-Id: Idad7c5e994ac2a4ce686e79cb3ca9db65c60f2cc