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

Change-Id: Ibe0c44df14dfa60855d513a85e76d8eef63d25a8