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

Change-Id: Ie93a1111603cfb8e695ae8b70986c756d1bb012d