Merge "Finalize package intents used to trigger tz update"
am: 48d3181b1d

Change-Id: I49f8cf990c76b95f2ef8d4f2e7ad6d3fe4b4b80e