Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev