Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6a am: 1c36619f am: e95023f5 am: 0a2c7166 Change-Id: I3291adc53e8b102b3b0a464c19fe0783047279ee