Merge "Make PrivateStorageInfo have a public constructor." into oc-dev am: 71a17a4307
am: b03a1424dc

Change-Id: I29bab61979db7db4199a53aa144cb680e00f9bdf