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

Change-Id: I52f61574115f18e3e30ee16f1739a9af809888d2