Merge "Add Nullability Annotations and verification to CellIdentity" am: bf003b77a2

Change-Id: I26f24b28e372d95b8cb3a6bb9837f6c9076b3c4a