Merge "Revert "Add stats support for existing optimizations"" am: 5d78a0f808
am: 05718eb6a9

* commit '05718eb6a93a7525705ca5e823bdd8bea672582d':
  Revert "Add stats support for existing optimizations"