Merge "Revert the change of the session token parcel" into nyc-support-25.4-dev