Move metrics from namespace to class am: 282aa1f89d
am: e5e6f9c095

Change-Id: Ia8867b04e8b09f577249aeb9ec9d68226f42533d