am a127607e: am 57a9c7d3: Merge "Fix gtests."

* commit 'a127607e2c7911ab95c297343ffcf3980413e14a':
  Fix gtests.