Move metrics from namespace to class am: 282aa1f89d am: e5e6f9c095 am: 1e8f5d92d4
am: c7974d49d6

Change-Id: I3d8fff23f5eaa35d61fba5649f2e841ecf860513