merge Traffic and NetStats

Change-Id: I199673ef2de43fc42ad92295c1d27e9cfe0a8a6f