am 73d5dc67: am 969edb82: am 5885981a: Merge "Fix build break" into lmp-dev

* commit '73d5dc67665778a5cf01dc0cb0d586e57834c991':
  Fix build break