Merge "Revert "fix optimizing gtests""