am eae9dc3b: am c6f5009f: Merge "Fix build" into lmp-mr1-dev

* commit 'eae9dc3b7fdf21c50de864d5ab13c71446c7b2da':
  Fix build