Use valid metric ids

Bug: 286192024
Bug: 266008139
Change-Id: Ieaea2b181334d40224fd97a7e2280827220cecb8
Test: build
2 files changed