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