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

Change-Id: Ibcd6e31b9104b8c1c2a984b5e31c617e2bf5364c