Hotfix for <0> in language urls

Change-Id: I14b126c793c8c30cd1a44b820ebdca8d082335af
Merge "Hotfix for <0> in language urls"