Merge "Add stats support for existing optimizations" am: be0c2d9102 am: aeb99f91a1
am: 54c8e74ee9

* commit '54c8e74ee9d4eb13588090c541c8fa7cfef9c03e':