Merge "Add counters for the automatic storage manager." into nyc-mr1-dev