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

* commit 'aeb99f91a1690d80df50d81b1a1548cc5d10a4fa':
  Add stats support for existing optimizations