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

Change-Id: Idb0448c477445735b31a0dcd9d30df069470ff85