Merge "Improved storage accounting:" into nyc-mr1-dev