Merge "Update the comments for all CellIdentity*."