Merge "Fix broken test" into tm-mainline-prod