Merge "Revert "Use optimizing for apps.""