dataset2 to use new dataset module

Change-Id: Iea15e73f3d01f7fe59e32adccdb7e9b1769ca033