am b250d293: Merge change 1722 into donut

Merge commit 'b250d29335bae367be26a6f00a04f9e04ff0d135'

* commit 'b250d29335bae367be26a6f00a04f9e04ff0d135':
  Handle null timezone.