Merge "Rename API to match StorageStats." into oc-mr1-dev