DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours am: 7ae5d30389 am: eb7c20df71
am: 09c18b79e0
Change-Id: I54a1eca54c2a50d5545875a66fed9766b409438a
This commit is contained in: