[automerger] DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours am: 84a9da7ac9 -s ours am: 3ba9598f23
Change-Id: I4b5d6970b199efd861d25633abd0433446ca1304
This commit is contained in: