am b629aeeb: am 8cbc6700: Merge "Fix build break" into lmp-dev

* commit 'b629aeeba766b1bb23c3ae233222113af38e23f0':
  Fix build break