Merge "[RESTRICT AUTOMERGE] Fix test failure caused by incorrect string" into tm-dev