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