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

Change-Id: I8dfeeaec257188d81a83122aeb7893321eee7677