am 7f22eb98: Merge "Fix build break" into lmp-dev

* commit '7f22eb981812309a1e751a891428dffe6b1da175':
  Fix build break