Merge "Fix QOS API review comments"