Merge "Correction in quota_client's condition logic"