Merge "Add UPDATE_TZDATA to config updater intents" into oc-dev