[automerger skipped] DO NOT MERGE: Adds artificial package handler latency am: de626c28d7 am: 895d932835 am: 251a110c45 -s ours
am skip reason: subject contains skip directive

Change-Id: I604ada1336e1e7b74fc3b6c92fc9c0d636fad794