Merge "Fix issue #27530395: API Review: JobInfo.Builder" into nyc-dev