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

* commit '3da4fe0ac2c0b52ab2e14791f98ea3297432e63b':
  Revert "Add stats support for existing optimizations"