merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: 78df332ef1
am: ee23541449

* commit 'ee235414493f963dcbbf7d4f87f725055315d442':