Update UniversalLanguageSelector to master

Change-Id: Icc4600b617a5fe9c8e2be402b8620e2a59b8df14