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

Change-Id: I2539160ebbac1eb4bad3f54a76e58623711b3e9c