am 3a3ba5cc: am 640ce0ab: am 296c6cc2: Merge "Revert "fix optimizing gtests""

* commit '3a3ba5ccb81c58c62db391d31a1b08555a5a2e53':
  Revert "fix optimizing gtests"