Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev