First thrash of Select Langauge and related topics

Change-Id: I94c5ee6ab19da8abee9d8a7a96595c78a0c00e48