Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6
am: 1c36619f5b

Change-Id: Ibdc1ed0f0d432d0b47082195229001ca7174f3ef