Merge "Convert to ISO 639-2/B for menu language"
am: 8e217ba958

Change-Id: Iaea64c7fed62cfae3c5359ea062d6498c8b9dc14