Merge "Separate data stall detection and recovery from net stats." into ics-mr0