tree 14d58a2089628f322e5db542fb72efeaef0a11c1
parent b44d59edee56e28dc71c49717a3f9b7cc3d6a2cd
author Garfield Tan <xutan@google.com> 1492727258 -0700
committer Garfield Tan <xutan@google.com> 1492736007 +0000

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)