Merge "Enforce duration metric dimension rules"