Merge changes from topic "cherrypicker-L08900000954891083:N79200001270491487" into sc-qpr1-dev

* changes:
  [automerge] Stop using invalid URL to prevent unexpected crash 2p: fe57c5bf89
  Stop using invalid URL to prevent unexpected crash