am 6599426f: Merge change 4017 into donut

Merge commit '6599426f74371c823fcfe570f61577262eb0df44'

* commit '6599426f74371c823fcfe570f61577262eb0df44':
  Make the date format preference work again.