am 88c692ca: Merge change 9522 into donut

Merge commit '88c692ca2ce4f0680340cb66f5fe82bfdd532581'

* commit '88c692ca2ce4f0680340cb66f5fe82bfdd532581':
  Merge Korean abbreviated date format fix from cupcake.