Merge "More knobs for connectivity experiments." into pi-dev