Merge "Rename API to match StorageStats." into oc-mr1-dev am: 74f7a1425f
am: 6099e1c142

Change-Id: I8241dc312a087cb84e5d51fd6db5aeced5e87a2c