DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours
am: 181a10e364  -s ours

Change-Id: Iea8aaec612ff4837000fece3813764b424f9227b