DO NOT MERGE Add CTS test for URI fix.
am: a02bbf31c4  -s ours

Change-Id: Ie6deaf23a60a51cae1fc5441006649134640e44b