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

Change-Id: I09488ba9034d12113fd6bb4252069dedce3dbb6a