Merge "Support merging device info metrics." into ics-mr0