am c6d1d6a7: (-s ours) am 9bc0b46d: Update BuildVersionTest for 2.3.7

* commit 'c6d1d6a70cd178bba8f40a3d7e0a256379d6f81f':
  Update BuildVersionTest for 2.3.7