Merge "Implement dual-permission model for storage."