Fix build breakage: MetricMaker Field constructors changed. Change-Id: Ib5aeb76e2559c64187924380d3fd890869ed6270