am 266440ef: Merge "Support merging device info metrics." into ics-mr0

* commit '266440ef9b7aee437d971afb688a91b6a48e8cca':
  Support merging device info metrics.