Merge "Add Network Scan helper class"