[automerger skipped] Merge "Parcel only the canonical Uri.Part representation, not both." into qt-qpr1-dev am: 7a9c03e529 -s ours

am skip reason: Change-Id I2bc2008e49de5a66641ecdbd8e5354dfa647269d with SHA-1 c9afa38f97 is in history

Change-Id: I7a7b61af41419bd722b055af2e3b41f673c17992