[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

Change-Id: I94da0302a34af39fc66f5817aaa94844ea190314