am: cf43b5523f * commit 'cf43b5523fd12fdc69ea25cb6dbf5e95724927ec': DO NOT MERGE Race condition in JobServiceContext