am 11b98d00: am 1c285915: Merge "fix optimizing gtests"

* commit '11b98d006b356fe096e546434637277dc650e4a5':
  fix optimizing gtests