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 am: 2ef4392dc8 am: ddd7efeef4
am: 03782ea6ef -s ours
Change-Id: I8ac3b97a6af09df49086574c376e8bbc88b30f28
This commit is contained in: