am 4936d259: Merge "Fix verbalizing missing emoticons"

* commit '4936d259d7eaa00017b73fdb3a1ae0fadb0531e2':
  Fix verbalizing missing emoticons