Merge "Switch from deprecated/removed JobInfo method."