Merge "More knobs for connectivity experiments." into pi-dev
am: 70df722321

Change-Id: I4957ea5904101d781820f2dbbc5199a3139e2a54