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

Change-Id: If07c5a8d84933e8a353a77b39a1aa76f4a51a5bf