Traffic meter small clean up

Change-Id: Iea15b1ee741b14f65124da514ed828a2ee77ef09