Merge "Fix handling of URIs with subId" am: 025122acbe am: 069c3655b4
am: 4134c79b8a  -s ours

Change-Id: Id45d180381d0345adc254d1b9b6a7d9b0d269c35