am 57a9c7d3: Merge "Fix gtests."

* commit '57a9c7d3bb01a82767a537a07aa2d6f99f958d15':
  Fix gtests.