am 0d8f1ae3: Merge "fix build." into lmp-dev

* commit '0d8f1ae3e070d7a13f8e482895bcab428a6c8381':
  fix build.