Move metrics from namespace to class
am: 282aa1f89d

Change-Id: Ib90ac8625ec1271eaadec2e10927243e3dfe8eb1