DO NOT MERGE: Adds artificial package handler latency am: de626c28d7 am: 895d932835

Change-Id: Icbf1e5c7475260bee1c147f92aa328dd29f4fb17