Add allow_overlapping_ips parameter toggle

Change-Id: Icc29933b1ffa24a117625c7e0d8ced4954a62d32
Merge "Add allow_overlapping_ips parameter toggle"