Merge "Add unit test for CellIdentity."