DO NOT MERGE Add CTS test for URI fix. am: ccd5db3a51  -s ours am: 65408dc312 am: c0411106a9 am: 02a78c5cf9 am: b1969e0aa9  -s ours
am: e5a8397975

Change-Id: I4286ec388c3f85b681909b049cac2a2378e6ed27