Merge changes from topic "am-9077272085e84c259e30c7aac7f599d6" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L08900000954891083:N79200001270491487" into sc-mainline-prod am: a55c76e2 -s ours am: d40f030a -s ours am: 21e8270d -s ours am: fb0f6f89 -s ours
  [automerger skipped] [automerge] Stop using invalid URL to prevent unexpected crash 2p: fe57c5bf am: fd8519c2 -s ours am: eb0e5341 -s ours am: 423d42d0 -s ours am: b384862b -s ours