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

* commit '5d78a0f808b4bf65e7f42880b39f2d0f3942cee6':
  Revert "Add stats support for existing optimizations"