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: 19a2731fd2 -s ours am: 338f22f4c3 -s ours am: 11a6a7b9b1 -s ours am: fc8940b312 -s ours
  [automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 191944ece5 -s ours am: fd0c365f1f -s ours am: 70bf1b0516 -s ours am: 373901f645 -s ours