Merge "Revert "Fix test case fail""