am a25d0b97: am a0351d44: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev

* commit 'a25d0b9747832ac84e195d4596476debed24cb23':