Removed deprecated job ID cruft

Change-Id: I1db3b9adeaaeb66821e9ff6a931f7905ce916b7f
Merge "Removed deprecated job ID cruft"