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

Change-Id: Ia595b77f85f4b665cf7b20930544f046ea22b919