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

* commit 'a9ae9889b4f61087e0d5163e4404bb41681eeae9':
  optimizing: fix gtests