[automerger skipped] Merge "Fix parceling and unparceling for URIs in Telecom." am: 68a50c1b2f am: f94ecdc108 -s ours

am skip reason: Change-Id I87b881e55a749e0ea46ba3b3c7d297856a744f37 with SHA-1 83d6a74cf0 is in history

Change-Id: I5d9391df0bda51c8cd2f1af0a4005a19f990aaf6