Merge changes from topic "historybuildertest" into tm-dev

* changes:
  Disable NetworkStatsHistory builder test in tm-dev
  Return sorted NetworkStatsHistory
  Use fallback method if the importer throws