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

Change-Id: Ibc0862fb7ae1063cbee10415c4c21d7d4a835c51