Merge "Move QoS API classes to Connectivity"