Merge "Fix the testcase error" into tm-d1-dev