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

* commit 'a64c571454b26a7c15d1b1667a35e2211caed345':
  Fix build break