Merge "Fixed VTS for non-CDMA devices" into main