DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
am: d9ac06f2c2 -s ours
Change-Id: I65c91a852c2e7f580a2b58098786b9e39d380d10
This commit is contained in: