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