DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: 50ec90be8d -s ours am: d5544e43e2 -s ours am: 16488117dc
am: b59215308a -s ours
Change-Id: I6744dc30bcac211c42225f435df0365fe095342d
This commit is contained in: