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

Change-Id: Ic94053bb496fe89612acb3d45eb60641b6dce0ab