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