Merge "Fix typos that cause infinite recursion and CTS test failure."