Merge "Fix for QoS APIs: "Update" and "List" URLs"