am 1f64c188: (-s ours) am 07a7d5ce: am ba79889d: (-s ours) Disallow empty eventTimezone values. Do not merge

* commit '1f64c188804bc4c15e4a97ed1792dc22ea1b111b':