am 9ff1ffd8: Merge "Improve diagnostics in the face of bad tzdata."

* commit '9ff1ffd805b57160079f42d7eea051c63e0e2bca':
  Improve diagnostics in the face of bad tzdata.