Merge "Ensure Dequeue/Queue duration is always set" into nyc-mr1-dev am: 295d81c360 am: c5153683fb
am: 7c3b7865ce

Change-Id: I82a2258e334d506899a47484407250c65efa6389