Merge "Fix OOM for Network Discovery"