Merge "NetworkStats: Avoid Division By 0" into sc-qpr1-dev