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