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