am 295e7248: Merge change 3676 into donut

Merge commit '295e7248b11557cf80ee9b7a12009d9cec5bd8b0'

* commit '295e7248b11557cf80ee9b7a12009d9cec5bd8b0':
  Get the FormatDateRange tests passing again.