[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours am: ca0bfec15d  -s ours am: 694da5a82b am: a86e840b99 am: b56b0f7e8b
am: e4ed6248cd  -s ours

Change-Id: Iba6d6c94424c81f04614f60227b1c18b74272b15
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/