Merge "Revert "Revert "Use optimizing for apps."""