Merge \"Add counters for the automatic storage manager.\" into nyc-mr1-dev
am: d9f0e37dc1

Change-Id: I00bcd2808aba694d66f1db689acebea26ed5eeee