merge in lmp-mr1-release history after reset to 4cafe2ff89b49329e0e880900195d8e061bd3750