DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
am: df249cbcbb -s ours
Change-Id: I4a60d7a706e5753fe7402a6d27c67deaa5ca02ef
This commit is contained in: