Merge changes from topic "historybuildertest"

* changes:
  Return sorted NetworkStatsHistory
  Use fallback method if the importer throws