Resolve a metrics conflict.

Also adjust orders of metrics to match their values.

Test: It builds.
Bug: 37547295
Change-Id: Ifab41fe471aa629872f5c73990e2c75aba578ff2
(cherry picked from commit 8d1443a06019b94e513d2d188ec2510e111ba944)
1 file changed