Merge changes from topic "am-5488dba4d7974b56980d8cabcd7c3fb5" into udc-dev

* changes:
  [automerger skipped] Merge "Fail parseUri if end is missing" into sc-dev am: de4baa7c -s ours am: 3473ac09 -s ours am: 0f321a94 -s ours am: 4f0ff92b -s ours am: 55ba6009 -s ours
  [automerger skipped] Fail parseUri if end is missing am: 68268563 -s ours am: 99e63d7b -s ours am: 9a8286d6 -s ours am: fbf2f806 -s ours am: e8a05022 -s ours