Validate the tenant-id of the request

Change-Id: I6321d3ada5ff66ba046fdbc5b5e260570057e6cf
Merge "Validate the tenant-id of the request"