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