Partition metrics by name instead of tenant id

Change-Id: I7d8c86879fb7ca33113430be74d55ccccd99ab69
Merge "Partition metrics by name instead of tenant id"