Merge "Correctly deal with non-null ness of PrintJobId."