Merge changes I794a24d0,Iab32b2db

* changes:
  Remove setHandler in NetworkStatsService
  Remove the need of accessing handler in NSS unit test