Merge "Switch to streaming data for time zone update" am: f093d4e13e
am: 4fee968fa8

Change-Id: I042861293371d07f62b05b28dc7c3a2ffb090812