[automerger skipped] Merge "Update default value of probe url to be a...

[automerger skipped] Merge "Update default value of probe url to be a constant" into rvc-dev am: 19b2c8a1 -s ours am: babaff35 -s ours am: 92973d0d -s ours

am skip reason: Change-Id I1846958e7c4e8b64ae287718c63e705bb232632a with SHA-1 44ee27b1 is in history

Change-Id: I48dc96178a59d495c850ac7e52f375b0015aed52