Merge "Expand use of 'Str' suffix in CellIdentity to 'String'"