Merge "DO NOT MERGE. Backport test fixes from lmp-mr1-dev" into lmp-sprout-dev