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

* commit '91a449d72f313c23f69ba89766bc0dd705f7d561':
  fix optimizing gtests