DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours
am: d9ac06f2c2  -s ours

Change-Id: I65c91a852c2e7f580a2b58098786b9e39d380d10
tree: 59be354e010f9cf95aaa3d0cbbf9b1ff92fcacd6
  1. tests/