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

Change-Id: Ief1906af78e69da0c8d09e7b467ec0f2f4743339