Merge "[VTS] Seperate Nan and Rtt from Sap test" into rvc-dev