Merge "Fix leaks" into nyc-dev
am: ea8ee68507

* commit 'ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
  Fix leaks

Change-Id: I5fffa584a7e265533c17b341636421ee99d4812c