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

Change-Id: I9ebe0964d0cd8777cff515a9083f6c808ce2542c
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/