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: b584b3f4e1

Change-Id: Ib4e7ebe436b217bf169ba9715bf79519a894df2a