Merge branch '38127-testonly' into dt-test