Merge "Update a CTS test due to API rename."