Bad information here. US law provides that for tickets to/from the USA, the baggage allowance for the marketing carrier of the first segment is the allowance for all segments of that ticket, including the return.
Who is the marketing carrier for your BKK-NRT segment and what is the allowance for that segment?