Merge "Use a status code to detect unknown vs. missing tenant"