DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours am: 2ff1dfc44f am: 90ee516098
am: 59942f6f77
Change-Id: I395b0060e6aff8dc0031f04c3991c03f2bc3c30e
This commit is contained in: