Update datagen decorator to support lists

Change-Id: I1b5f49cc1872e4262bec2c6abb80b2d149536c2b
Reverts tag reporting changes

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