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

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