am 90078eec: Merge "optimizing: fix gtests"

* commit '90078eec8b676d363a8116f487df3596c9f23ea8':
  optimizing: fix gtests