Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev