Merge "Merge "Update the comments for all CellIdentity*." am: 2610ad0556 am: 4f95fd8532 am: 06b73ece42"