Merge "Move alpha long/short to the base CellIdentity according API Review."