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

Change-Id: I1daa8fed661c7d6fa7154fef9d183efdacaa63fb