Update data3 & data5 dirs

Change-Id: Ieaf605384a920da7a4282e8017439e94b8eec42c