am 2a96a389: am cf3580b0: Merge "Fix build." into lmp-dev

* commit '2a96a3890975a991cbd91e9444325b0ee879caae':
  Fix build.