Merge changes from topic "am-5a11a677afb042cfb9023494b6cb12b3" into udc-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into sc-v2-dev am: 19a2731f -s ours am: 338f22f4 -s ours am: 11a6a7b9 -s ours am: fc8940b3 -s ours
  [automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 191944ec -s ours am: fd0c365f -s ours am: 70bf1b05 -s ours am: 373901f6 -s ours