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
Change-Id: I29a2fc035147a9ab695dd8ca3e8c1dbabbb83246
This commit is contained in: