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 am: 2e88fb1b72 am: 546cc40a5a am: f777cb29a7 am: 5a6520b002
am: 6a79afc410

Change-Id: I1811997c935ca1996c494e2c3c8d98101ff50deb