Merge "Special-case English for DateTime and Time key listeners" into oc-dev am: 91d289903c
am: 300d74e34e

Change-Id: Ic6dfb3e20ef409d9ef7e63578d8db25013537046