am bee2ddef: Merge "Fix BuildTest." into lmp-dev

* commit 'bee2ddef11286dc0ed3a3b76e810dbf73cad6819':
  Fix BuildTest.