Merge "Revert "Add stats support for existing optimizations""