Merge "Start fleshing out new storage APIs."