DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours
am: bf44542d59

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