Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
am: 47c8abaa67

Change-Id: I55c9981c4082af3d67cb68ea27147962405ce97d