Added data dir location option

Change-Id: I086cf549306275d5e6c0a2ac4a888c3f97f8583a