tree eb8aeefd0016e0e7b88c03f99dfa1c348ac393c9
parent a413c3558bb4065cf86a16736825e9a5235d5252
author Garfield Tan <xutan@google.com> 1492727258 -0700
committer Garfield Tan <xutan@google.com> 1492728453 +0000

Resolve a metrics conflict.

Also adjust orders of metrics to match their values.

Test: It builds.
Bug: 37547295
Change-Id: Ifab41fe471aa629872f5c73990e2c75aba578ff2