Merge "Wire up geotz metrics to the real metrics code" into sc-dev