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