Pass the data directory rather than the root directory

Change-Id: Ic6672e2895d2b23d4156d000033efdbca67590c0