Merge "API council requested tweaks to JobInfo." into pi-dev
am: a9975804a2

Change-Id: I40217f8df995db19a59e0253b3d8d0440d57acb3