Fix when same metric has different columns (dimensions).

Change-Id: I99eae4209d67dff4d4f4c834e19b69ef4ac59074