am 2b6d670b: (-s ours) am ba79889d: Disallow empty eventTimezone values. Do not merge

* commit '2b6d670b272c74fcb0dfe7cee02b980715f760ab':
  Disallow empty eventTimezone values. Do not merge