am be9478bd: am a0a12fbb: am a3f88f73: am 03c38ac8: am 55df6c94: am f23d7ff2: am bee2ddef: Merge "Fix BuildTest." into lmp-dev

* commit 'be9478bdcba8262a797fdd741232c146c4c45013':