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

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