Merge "Fix handling of URIs with subId" am: 025122acbe
am: 069c3655b4

Change-Id: I46a302b90d72f73fdf287753dcfc8bf78b7ab462