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

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