Updated object smoke to use new data driven object generator.

Change-Id: I440c5c657a64ec335903060505e8f24173284249
Merge "Updated object smoke to use new data driven object generator."