am aae99eaa: am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev

* commit 'aae99eaa148ad74efbcd1519cc34363823e3c560':
  fix build
  fix build