merge in lmp-mr1-release history after reset to 93176114cf34c9874c2db70fd7665e9f95dda9d0