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

Change-Id: Ic6b1f0966f4ac3ed9c9d1a1836683b066b3e819d