Update UniversalLanguageSelector to master

Change-Id: I9a02a0c16896084940bf40d7fa480f0f2ff8b127