DO NOT MERGE Add CTS test for URI fix. am: 5470431480  -s ours
am: 3daf33c78e  -s ours

Change-Id: Ib86bbf945a20b57aef400db20614de5aab0a7d86