[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b
am: 61167e098e
-s ours
am skip reason: skipped by user siyuanh Change-Id: I0c69f31c9a4e16d3e6f479feddcf2ab452cab8a8
This commit is contained in: