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

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