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

* commit '5c7d5cdd8922dd25c264a0af9d1e09894787d879':