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

Change-Id: I4ba5218468817eb3be39af8e2e5b995744e5f069