am e5f57c1d: am 90078eec: Merge "optimizing: fix gtests"

* commit 'e5f57c1da7c97768d5ef4d1b8e9e4b22de9457d5':
  optimizing: fix gtests