Merge "Finalize package intents used to trigger tz update"