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

Change-Id: I607f7ce3fa857fb15100a9305ba4c6f7484a4a72