Merge "fix optimizing gtests"