Merge "Use text input for various internationalized listeners" into oc-dev
am: 94b6b532c0

Change-Id: I38faf86ec475154d437cc7dc7a363d58fd5962da