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

Change-Id: I2a85de8e679ef4e1517d96c1c5d6eb0b3ea40778