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

Change-Id: Ifd12878a04cd994fb5a6d7eb9bbbac262b90d8e7
(cherry picked from commit 2e38037bc626faebaa8a1bc9229c13057346d082)
1 file changed