Merge "Switch from deprecated/removed JobInfo method."
am: 2c6267a622

Change-Id: I58dcd3d7dc6f679c4cd26a71b949542889055131