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