Updated object generators to allow data to be provided for the generated
objects.

Change-Id: Ie59443aad0b9f2aa5a1082635ea5760d686b5bd7
Merge "Updated object generators to allow data to be provided for the generated objects."