DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: efb0258e08 am: 2c7b1033b8
am: e3542ba9d1

Change-Id: I079a60c74dbe0eb39db7a8706db790fd1dde2b6f
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/