Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc"
* changes:
[automerge] Postpone getting Metrics Category until it is needed 2p: af225530 2p: 8e7599c1
[automerge] Postpone getting Metrics Category until it is needed 2p: af225530
Postpone getting Metrics Category until it is needed