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

Change-Id: I8385254be56e18bcbd2e1d1614b371acbdc2cb00