Enable multi tenancy by default

Change-Id: Idf96ed36886ffc73dcb7af347eb8d0bce98f5718