am 1c285915: Merge "fix optimizing gtests"

* commit '1c28591571c035dfdd76f28d17151b3a6eba4aac':
  fix optimizing gtests