Merge "Fix a memory leak" am: 9d05a1150c
am: 4db88a09df

Change-Id: I722f66405de4c5fdb6686bd658493570bfdad06b