[Bugfix][API-860][Data]Try to fix Data 8004 problem

Change-Id: Ie566db12a3a8d0f2ff2e4a2fdb637cab2ce78dce
2 files changed