Revert "Revert "Fix test case fail""

This reverts commit 75261d01dfe443238a118ba92853ec0d0519710b.

Reason for revert: roll forward

Change-Id: I0b66ba4ea918baf54ae084f6281c172a07b160b2
1 file changed