Separating TC IDs for strings for noun and for number to avoid grammatical inflection.

Fix: 263548156
Test: manual test
Change-Id: I7b2f9a037a1b43cea871b5f0f967397eceabbc26
2 files changed