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
am: 9dcd9abb3e
Change-Id: I03e9ef4c6eabdb0466728358342a45b29f5eb313
This commit is contained in: