Merge "Fix NetworkCapabilities MTS on S, CTS on S+module"