am bd0710ca: am 2cc4fd5f: Fix BuildVersionTest

* commit 'bd0710caa97a3fd7248b8996c0b21ee8f5a272f2':
  Fix BuildVersionTest