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

Change-Id: Ia0f34432603380ae9c8c135a0c5439db86ed6bb6