Merge "Fix broken CTS test."