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

Change-Id: Ib8023d966e01fd2acefc464d8d25ed5030cfd85b