DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 am: 2c7b1033b8 am: e3542ba9d1 am: e1544712ff am: bc161e0872 -s ours am: 6329a0e2ae am: 7666fbb478
am: 0fc0967340
Change-Id: I605c18081e086bb5ddc1698d8a616c1e99e1c8c9
This commit is contained in: