Merge \"Consider queue & dequeue times for should draw\" into nyc-mr1-dev
am: 3a465e7a12

Change-Id: I2ea38a087056e2f75aeb27c5bce03fe52690cd6e