Add tenant_id

Change-Id: I9663bf68cfac568fa418d5b4ce3411feeeafd859