DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: bf44542d59 am: 9d37478448
am: f927fe1b92  -s ours

Change-Id: I2d66e421530d89f53ae02bf8e41a9ac555cb40f2