Add tenants

Change-Id: Ia6c21152c00c9380c17c559290ed98ff22cf767b
11 files changed