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

Change-Id: Ibeaea13b146e30b5f7d67c49295081632a6a7736