DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: 8db54315a0 am: c0411106a9 am: 6f4857d900 am: b1969e0aa9 -s ours am: abd196715f
am: d18aefffcf
Change-Id: I7c8519b6a1a747d2e104f5a9b349e2607906bdb5
This commit is contained in: