Workarounds for deprecated language codes for yi and id

Bug: 62720
Change-Id: I7feb4bef88b1771b79b114dea28235bedac5e296
Merge "Workarounds for deprecated language codes for yi and id"