Fix layout of metrics with long dimension

Change-Id: I9d9546f9e510969c86944cf313f6b8e18e9c197f