Merge "Update NR TAC limit to 3 bytes"