8181692: Update storage implementations

Reviewed-by: weijun, igerasim
3 files changed