DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours am: bdf5a47c67 -s ours am: 39127a559b -s ours am: 2181876b7e -s ours am: 09167ba006
am: 12b98db4c3 -s ours
Change-Id: If5415f8f98cd19099b734dc4f4604add1a253ab3
This commit is contained in: