Merge "Add configurable captive portal probes" into pi-dev am: 1f8f21af60
am: 23d3487caa

Change-Id: Ia958815325d1466345e9626efc8f62fc9d08d774