DO NOT MERGE Add CTS test for URI fix. am: ccd5db3a51  -s ours
am: 148c58bdb3  -s ours

Change-Id: I802ec14db281665d47ae01ab90b0f8797237a2f2