Merge "Add tests for issue 18554122." into lmp-mr1-dev