Merge "Logging improvements for time zone updates" am: 2cae07284d am: 42199bf5a0
am: 80aaf8fa37

Change-Id: I0a9687a2aca7f3d189c8536a915bdf4882526af1