Allow multi tenancy with Admin only

Change-Id: I8ee93d0fa167519b8dac317e63898d3be02329ed
Merge "Allow multi tenancy with Admin only"