Merge "Update RTT CTS tests for changes"