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

Change-Id: I301139240def3c5387ac3662317f375bc3b8a957