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

* commit 'c6f5009fdb6aeafbee6db2b3e381f405ff23718b':
  Fix build