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

Change-Id: Ibed9f7d9b3bd6e74fa25a8702e5ba4488892cc5b