Merge "Fix issue #28075893: Don't hold strong refs on to JobService" into nyc-dev