[automerger skipped] Merge "Add test configuration values for probe URLs" into...
[automerger skipped] Merge "Add test configuration values for probe URLs" into rvc-dev am: 9d517531 -s ours
am skip reason: Change-Id I8171fd6360a6e504f3abaea3d7de4fa308bbb35b with SHA-1 943d6347 is in history
Change-Id: I29d6e1288bdd61cdf792ee3358d9523549161c5e