Update datagen decorator to support lists

Change-Id: I1b5f49cc1872e4262bec2c6abb80b2d149536c2b
Merge "Update datagen decorator to support lists"