Merge "Storage API polishing." into oc-dev am: 200d72d933
am: aead06b971

Change-Id: I13baad3e589cfe6b1ee257fa13742394cdee3c51