Merge "Add statistics support for some optimizations"
am: afe8400458

* commit 'afe84004583488ded7f99bb703ed4c1a601ff034':
  Add statistics support for some optimizations