Update UniversalLanguageSelector to master

Change-Id: Iaa754de5ff185b3cf80e4fa2f119125cc147fe64