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

Change-Id: I24e9d58e1736d791dca26e124b714c98ef1f3914