Merge "DO NOT MERGE: Adds artificial package handler latency" into qt-dev am: 99fd132c3a

Change-Id: I96d1ea72d57e11c8dd6a35821ee6ea74a3c82429