Merge "Change limits/quota clients to return one value and update tests"