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

Change-Id: Ica2b189d6e98cf0231adec70897ae23bfa0a27a0