DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours
am: dfbb7a24e1  -s ours

Change-Id: I802ec14db281665d47ae01ab90b0f8797237a2f2
tree: 437a5c2b9bb14a7ffac6c80b297d67d10065ee21
  1. tests/