Merge "[RTT2] Clean-up the RTT service name"