Merge "[automerger skipped] Merge "Update parcling logic for Uris." into...

Merge "[automerger skipped] Merge "Update parcling logic for Uris." into rvc-dev am: cdb75845 am: adc6fe9a am: e6f43265 am: 31ecd6ad am: d3e895e0 am: 2b4cc903 am: b6931ef7 -s ours am: 40e4d9c7 -s ours am: 80ea0917 -s ours" into main