Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5

* changes:
  Remove unused variables
  Return offloaded traffic when querying from TrafficStats API
  Add hardware tethering traffic in testTethering test
  Remove unused getTetherStats