Merge "Fix leaks" into nyc-dev am: ea8ee68507 am: 065f27b14b
am: 3d4b3e768c
* commit '3d4b3e768cfbc05c8ecf6a27c38e91b2a21771a1':
Change-Id: Id130ee66eb2da4d338dc28d802dfe79a4d06d366
This commit is contained in: