am a8352cac: am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."

* commit 'a8352cac8dae324b9d30751a2e05628db5147f45':
  The zoneinfo stuff is no longer legacy.