Merge "Iterate on storage permissions model."