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

Change-Id: Id9bbd691b1c3c5e79b06814762ac8c66fae05f4a