Merge "Metric constants for dnd system and duration" into pi-dev