Android 7.1.2 release 9
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."" into nyc-mr2-dev