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

Change-Id: I5303926e34c973ca9e4a7d12d0f4cd46e2fbcde8