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

Change-Id: Ib7ff35497ec6f02d58db695954ae32b2ba75bb01
tree: f053791b2ab65c58895d16b53dad660248e0a11b
  1. tests/