Merge "Add external_storage gid"