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

* commit 'f23d7ff2bf58d3eab58eb7088d2c6503bd2f6f43':
  Fix BuildTest.