Merge "case for update qos rule, rule or policy non-existent"