Merge "Merge "Logging improvements for time zone updates" am: 2cae0728 am: 42199bf5 am: 80aaf8fa am: 26827d8f" into oc-mr1-dev-plus-aosp