Merge "Finalize package intents used to trigger tz update" into oc-mr1-dev
am: 293e2f9955  -s ours

Change-Id: Ib284f6bd5932b602de55bf154b644dc43a2774ec