[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23 am: a8a391899f am: 16b7318a02 am: bf5ae9c33b skipped: 37335953c6
Change-Id: Ie98a567e52f4366e613a9470010ecc03857433b5
This commit is contained in: