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

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