Merge "Fix a memory leak" am: 880d4e8574
am: 0b936b1028

Change-Id: If18df161319def7ac360108f86f33e5c52dcf013