[automerger skipped] Merge "Be more defensive around invalid tzids" am:...
[automerger skipped] Merge "Be more defensive around invalid tzids" am: f60c302d am: 96c57398 am: 29867f04 am: e533c57b am: 4ebac1c9 -s ours
am skip reason: Change-Id I6dc0f4f81848efbbaec6a11a62014471a0ef01fd with SHA-1 29fba44b is in history
Change-Id: I3ebca7bd48bc6c8c5012b98767129cb0fa8530cd