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