Merge "Migrate convertHalCellIdentityToCellIdentity()"