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

Change-Id: Ie3c352bc87cf6cd74a1e073efe4a99b518b133e4