Merge "Add Nullability Annotations and verification to CellIdentity"