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

Change-Id: Ibc279e6d448564efe84981460b54cb9d13e7abd3