Merge "Change network validation probe default configs" into nyc-mr1-dev
am: 8ae3abd0eb

Change-Id: I1447aed1b6d46b3bb391e0e614ca2d2cb2e933bf