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

* commit '84e9479a09ce7dd9bb0a153ba75fe78554a0c114':
  Fix build break