Merge "Fix memory leaks" into lmp-dev am: 3e913a793c am: 0ae16eb779 am: cf520f4f9e am: 22b4aa34ea am: a4856a624a am: 64fa39c01c am: ffb8750131
am: f2131eb33e

Change-Id: I485506bfa51288be02ff02d9c4f0a2e96a44e69d