Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
am: 06a53d4729

Change-Id: Ia739bdad9c5877f9e02efba709521fb9c9dc8795