Traffic meter reorganization

Change-Id: I51e90a444e7722cc4ac31552c7652cf81105eb72