Merge "Add methods to query the private storage." into nyc-mr2-dev am: 652276ca3f
am: fa29b71078

Change-Id: I5181051fceb98dc1aa297738dc9ad381fe1d1419