Merge "jobqueue: Follow-up for fc5d51f12936ed (added GenericParameterJob)"