Partial revert of gerrit 8ed6dfa5423 to avoid i18n mis-links

Bug: 52276
Change-Id: Ie72ac3f33e1abda03a6fdcf54c5b0e7615302fad
Merge "Partial revert of gerrit 8ed6dfa5423 to avoid i18n mis-links"