Merge "Remove storage sandboxes related code."