am fb122f3c: Merge "Fix build break" into lmp-ub-dev

* commit 'fb122f3cc697f9190e0c08b3ebbbd0136994f348':
  Fix build break