Merge "Fix parceling and unparceling for URIs in Telecom." am: 68a50c1b2f

Change-Id: I9f15005fd017442afd6894b9769df883524fc055