DO NOT MERGE Add CTS test for URI fix. am: ff97586f -s ours am: 1565484c -s ours am: 17f7bd40 am: b7a93eb7 Change-Id: I758fa1d489e64c82465443cc6f91a23673060d7d