Merge "Fix memory corruption in test" into lmp-mr1-dev