Merge "[RTT] Route legacy RTT API on top of new RTT API"