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

Change-Id: I5dc299f98f15a7b58203136abf6e10a4ab945286