As other said, it will probably be XC/XI. Even with an operational equipment swap, there are not going to be XP's around to sub in anyway. I would go 21H/J depending on which way you swing
Getting a little OT, but does anyone know why UA operates 2 versions? It seems that an F lav is moved form next to the cockpit door on the left to the middle front of the F cabin. Is there a flight deck rest area in the XP where there is a lav on the XC/XI? I would have thought the two extra F seats and 4 extra C seats on the Asia routes would have been preferable. Although I guess 1 F seat goes to the flight deck crew rest anyway.