Merge "Update CTS to use renamed API method."