Switch crossTenantId for tenant ID in metrics that are published downstream.

Change-Id: I60d0b8a3b94031723fc1c319159cfe10217b9fa2