Merge changes Id2a6bfdf,I5cab2b78

* changes:
  Remove qtaguid support in NetworkStatsFactory
  Refactor NetworkStatsFactoryTest