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

Change-Id: Ib945110140e94747c31d9763e61c30f259dd9d36