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

Change-Id: I9d396a49b8e20aabd5d5590ccc38c1ed1a008555