merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d8883cc7fed5527