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