DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 78f5d24a4f am: 2f42f87a5f
am: be7378e99b -s ours Change-Id: If7c4dd7ea9d85ddd0bd54fb4b234418d315e5e5b
This commit is contained in: