DO NOT MERGE Add CTS test for URI fix. am: ff97586f14  -s ours
am: 1565484c71  -s ours

Change-Id: Iea8aaec612ff4837000fece3813764b424f9227b