am a8a63dd7: am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev

* commit 'a8a63dd7d9d49930b70371319b5712aed17a9c4c':
  Flush the clock format when the locale changes.