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

Change-Id: I87bddf540b3e47903b5709b81e3f6f2925727995