Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev am: adaae4cb91
am: 9822017b0f

Change-Id: I60e9bd9c0124a7844fb626747911ce8c9abb25d0