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

Change-Id: Idad5b07c4403a3205bbc9ead50f3d56a7663a999