Merge "Add Conversion from CellIdentity to CellLocation"