[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b
am: 61167e098e
-s ours am: 631493c8e7
am: 2564fce75b
am: e27f6ef6fa
Change-Id: I62d92bf95bd0f4c0928dc118186815e791c02edf
This commit is contained in: