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

Change-Id: I05690c75feed668851acd618c65aaa6ca4c3402a