DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours am: ad0b72a35f am: 47f89788d7 am: 3746042fc5
am: d312f113cd -s ours
Change-Id: I49a990610584c416d9387f76557a709b4cbcb6b2
This commit is contained in: