Merge "Make PrivateStorageInfo have a public constructor." into oc-dev